From a4f86af3e4d955172d35f2b5b4db95288d6138ff Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@citrix.com>
Date: Mon, 17 Jan 2011 17:14:20 +0000
Subject: [PATCH] tools/blktap, blktap2: include <sys/mount.h> instead of
 <linux/fs.h>

The former is a userspace sanitised header which contains the
definitions we need. In some distros linux/fs.h defines WRITE which
conflicts with blktaps own use of that name.

Also there is no reason to use <linux/errno.h> over the more normal
<errno.h>.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
 tools/blktap/drivers/blk_linux.c  | 2 +-
 tools/blktap2/drivers/blk_linux.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/blktap/drivers/blk_linux.c b/tools/blktap/drivers/blk_linux.c
index f1b14bd6e8..bb52717050 100644
--- a/tools/blktap/drivers/blk_linux.c
+++ b/tools/blktap/drivers/blk_linux.c
@@ -1,6 +1,6 @@
 #include <inttypes.h>
 #include <sys/ioctl.h>
-#include <linux/fs.h>
+#include <sys/mount.h>
 #include "tapdisk.h"
 #include "blk.h"
 
diff --git a/tools/blktap2/drivers/blk_linux.c b/tools/blktap2/drivers/blk_linux.c
index 75ddcc389f..85763acada 100644
--- a/tools/blktap2/drivers/blk_linux.c
+++ b/tools/blktap2/drivers/blk_linux.c
@@ -1,7 +1,7 @@
 #include <inttypes.h>
+#include <errno.h>
 #include <sys/ioctl.h>
-#include <linux/fs.h>
-#include <linux/errno.h>
+#include <sys/mount.h>
 #include "tapdisk.h"
 #include "blk.h"
 
-- 
2.30.2